Autogenerated HTML docs for v1.4.2.3-gabd697
diff --git a/git-cherry-pick.html b/git-cherry-pick.html index f4fd6b2..f7f0449 100644 --- a/git-cherry-pick.html +++ b/git-cherry-pick.html
@@ -272,7 +272,7 @@ </div> <h2>SYNOPSIS</h2> <div class="sectionbody"> -<p><em>git-cherry-pick</em> [--edit] [-n] [-r] <commit></p> +<p><em>git-cherry-pick</em> [--edit] [-n] [-x] <commit></p> </div> <h2>DESCRIPTION</h2> <div class="sectionbody"> @@ -301,16 +301,30 @@ </p> </dd> <dt> +-x +</dt> +<dd> +<p> + Cause the command to append which commit was + cherry-picked after the original commit message when + making a commit. Do not use this option if you are + cherry-picking from your private branch because the + information is useless to the recipient. If on the + other hand you are cherry-picking between two publicly + visible branches (e.g. backporting a fix to a + maintenance branch for an older release from a + development branch), adding this information can be + useful. +</p> +</dd> +<dt> -r|--replay </dt> <dd> <p> - Usually the command appends which commit was - cherry-picked after the original commit message when - making a commit. This option, <em>--replay</em>, causes it to - use the original commit message intact. This is useful - when you are reordering the patches in your private tree - before publishing. + It used to be that the command defaulted to do <tt>-x</tt> + described above, and <tt>-r</tt> was to disable it. Now the + default is not to do <tt>-x</tt> so this option is a no-op. </p> </dd> <dt> @@ -346,7 +360,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 03-Oct-2006 08:40:55 UTC +Last updated 06-Oct-2006 01:00:24 UTC </div> </div> </body>
